merge
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 16 Aug 2006 16:11:56 +0000 (17:11 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 16 Aug 2006 16:11:56 +0000 (17:11 +0100)

Trivial merge